b79aa08cdde0f1e1cc80524e45abec9a8ae32ad6,uportal-war/src/main/java/org/jasig/portal/portlet/container/cache/PortletCacheControlServiceImpl.java,PortletCacheControlServiceImpl,purgeCachedPortletData,#IPortletWindowId#HttpServletRequest#CacheControl#,418

Before Change


			return this.publicScopePortletResourceOutputCache.remove(publicCacheKey) || renderPurged;
		} else {
			Serializable privateCacheKey = generatePrivateScopePortletDataCacheKey(httpRequest, portletWindowId, entityId, definitionId, portletWindow.getRenderParameters());
			boolean renderPurged = this.privateScopePortletRenderOutputCache.remove(privateCacheKey);
			return this.privateScopePortletResourceOutputCache.remove(privateCacheKey) || renderPurged;
		}
	}

After Change


        
        logger.debug("Purging all cached data for {}", portletWindow);
        
        boolean removed = false;

        //Remove all publicly cached render data for the portlet
        final Set<PublicPortletCacheKey> publicRenderKeys = this.publicPortletRenderCacheKeyTracker.getCacheKeys(definitionId);
        removed = removed || !publicRenderKeys.isEmpty();
        this.publicScopePortletRenderOutputCache.removeAll(publicRenderKeys);
        
        //Remove all publicly cached resource data for the portlet
        final Set<PublicPortletCacheKey> publicResourceKeys = this.publicPortletResourceCacheKeyTracker.getCacheKeys(definitionId);
        removed = removed || !publicResourceKeys.isEmpty();
        this.publicScopePortletResourceOutputCache.removeAll(publicResourceKeys);
        
        final HttpSession session = httpRequest.getSession();
        
        //Remove all privately cached render data
        final Set<PrivatePortletCacheKey> privateRenderKeys = this.privatePortletRenderCacheKeyTracker.getCacheKeys(session, portletWindowId);
        removed = removed || !privateRenderKeys.isEmpty();
        this.privateScopePortletRenderOutputCache.removeAll(privateRenderKeys);
        
        //Remove all privately cached render data
        final Set<PrivatePortletCacheKey> privateResourceKeys = this.privatePortletResourceCacheKeyTracker.getCacheKeys(session, portletWindowId);
        removed = removed || !privateResourceKeys.isEmpty();
        this.privateScopePortletResourceOutputCache.removeAll(privateResourceKeys);

        //If any keys were found remove them